tests: workarounds to keep treeview scrolling tests running

We can't safely examine allocations synchronously using
gtk_main_iteration(), as there might be not enough time for a new paint
clock tick to have expired and the allocation set on the widget.
Work this around adding g_usleep() calls before processing pending
mainloop events.

diff --git a/gtk/tests/treeview-scrolling.c b/gtk/tests/treeview-scrolling.c
index e18174d2a961cec867b996ed80a7b7bf1f008edc..77dca9abc44699dce08b76ae569e3767f0b8235b 100644 (file)
--- a/gtk/tests/treeview-scrolling.c
+++ b/gtk/tests/treeview-scrolling.c
@@ -478,6 +478,17 @@ test_position (GtkTreeView *tree_view,
 
 /* Testing scrolling to various positions with various alignments */
 
+static void
+ensure_layout (void)
+{
+        /* HACK: sleep for more than one frame, to give the paint clock
+         * time to prepare the new layout */
+        g_usleep (100 * 1000);
+
+       while (gtk_events_pending ())
+               gtk_main_iteration ();
+}
+
 static void
 scroll (ScrollFixture *fixture,
        GtkTreePath   *path,
@@ -492,9 +503,7 @@ scroll (ScrollFixture *fixture,
 
        gtk_widget_show_all (fixture->window);
 
-       while (gtk_events_pending ())
-               gtk_main_iteration ();
-
+        ensure_layout ();
        test_position (GTK_TREE_VIEW (fixture->tree_view), path,
                       use_align, row_align);
 }
@@ -561,9 +570,7 @@ scroll_after_realize (ScrollFixture *fixture,
                                      path, NULL,
                                      use_align, row_align, 0.0);
 
-       while (gtk_events_pending ())
-               gtk_main_iteration ();
-
+        ensure_layout ();
        test_position (GTK_TREE_VIEW (fixture->tree_view), path,
                       use_align, row_align);
 }
@@ -643,9 +650,7 @@ scroll_both_realize (ScrollFixture *fixture,
                                      path, NULL,
                                      use_align, row_align, 0.0);
 
-       while (gtk_events_pending ())
-               gtk_main_iteration ();
-
+        ensure_layout ();
        test_position (GTK_TREE_VIEW (fixture->tree_view), path,
                       use_align, row_align);
 }
@@ -812,8 +817,7 @@ scroll_new_row (ScrollFixture *fixture,
                                  column,
                                  TRUE);
 
-       while (gtk_events_pending ())
-               gtk_main_iteration ();
+        ensure_layout ();
 
        /* Test position */
        test_position (GTK_TREE_VIEW (fixture->tree_view), scroll_path,
@@ -865,8 +869,7 @@ scroll_new_row_tree (ScrollFixture *fixture,
                                              scroll_path, NULL, FALSE, 0.0, 0.0);
                gtk_tree_path_free (scroll_path);
 
-               while (gtk_events_pending ())
-                       gtk_main_iteration ();
+                ensure_layout ();
 
                /* Test position, the scroll bar must be at the end */
                g_assert (gtk_adjustment_get_value (vadjustment) == gtk_adjustment_get_upper (vadjustment) - gtk_adjustment_get_page_size (vadjustment));
@@ -1013,6 +1016,9 @@ test_bug93584 (ScrollFixture *fixture,
        row = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL);
        row -= 20;
 
+       while (gtk_events_pending ())
+               gtk_main_iteration ();
+
        path = gtk_tree_path_new_from_indices (row, -1);
        scroll (fixture, path, TRUE, 0.5);
        gtk_tree_path_free (path);